From bcc65857674894a8f54fb07b1db0e96bb984ef9f Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 28 Sep 2009 08:28:26 +0100 Subject: [PATCH] AMD IOMMU: Fix boot output on non-iommu system Signed-off-by: Wei Wang --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index a66a7f5200..5d22289789 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -161,21 +161,15 @@ int amd_iov_detect(void) { INIT_LIST_HEAD(&amd_iommu_head); - if ( amd_iommu_detect_acpi() != 0 ) + if ( (amd_iommu_detect_acpi() !=0) || (iommu_found() == 0) ) { - AMD_IOMMU_DEBUG("Error detection\n"); - return -ENODEV; - } - - if ( !iommu_found() ) - { - printk("AMD_IOV: IOMMU not found!\n"); + printk("AMD-Vi: IOMMU not found!\n"); return -ENODEV; } if ( amd_iommu_init() != 0 ) { - AMD_IOMMU_DEBUG("Error initialization\n"); + printk("Error initialization\n"); return -ENODEV; } return 0; -- 2.30.2